bitkeeper revision 1.1159.189.4 (41a4d3f3keEAmBOlWfNQuSajvc5nHw)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Wed, 24 Nov 2004 18:33:23 +0000 (18:33 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Wed, 24 Nov 2004 18:33:23 +0000 (18:33 +0000)
commit4f47871b421481d409e7ad1dca445187e4a81319
treef067e131aed7874844c09be38cb8ea3f19a9e82a
parent7f1f8f64edc81aca58558b86408c385e26ed7dee
parent42217cbc5b3e84b8c145d8cfb62dd5de0134b9e8
bitkeeper revision 1.1159.189.4 (41a4d3f3keEAmBOlWfNQuSajvc5nHw)

Merge arcadians.cl.cam.ac.uk:/local/scratch-2/cl349/xen-tmp.bk
into arcadians.cl.cam.ac.uk:/local/scratch-2/cl349/xen.bk-smp-public
xen/arch/x86/domain.c
xen/arch/x86/memory.c
xen/arch/x86/traps.c
xen/arch/x86/x86_32/entry.S
xen/common/dom_mem_ops.c
xen/common/grant_table.c
xen/include/xen/sched.h